From: H. Peter Anvin Date: Tue, 24 Feb 2009 23:59:14 +0000 (-0800) Subject: Merge branch 'x86/defconfig' into x86/mce2 X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~22393^2~28^3~6^3~4 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=2aaa822984b97efd894d10d1e1382206ef0291a7;p=linux-4.9.git Merge branch 'x86/defconfig' into x86/mce2 Conflicts (resolved): arch/x86/configs/x86_64_defconfig Signed-off-by: H. Peter Anvin --- 2aaa822984b97efd894d10d1e1382206ef0291a7